From 3573cdc0cdb1b5ff52ae68990d793976ebe733e9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Fri, 14 Oct 2016 21:35:35 +0200
Subject: [PATCH] popover: Remove deprecated API

---
 gtk/gtkpopover.c | 85 +-----------------------------------------------
 gtk/gtkpopover.h |  6 ----
 2 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index ba4795e865..97df45bb61 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -129,7 +129,6 @@ enum {
   PROP_POINTING_TO,
   PROP_POSITION,
   PROP_MODAL,
-  PROP_TRANSITIONS_ENABLED,
   PROP_CONSTRAIN_TO,
   NUM_PROPERTIES
 };
@@ -173,7 +172,6 @@ struct _GtkPopoverPrivate
   guint modal              : 1;
   guint button_pressed     : 1;
   guint grab_notify_blocked : 1;
-  guint transitions_enabled : 1;
   guint state               : 2;
   guint visible             : 1;
   guint first_frame_skipped : 1;
@@ -214,7 +212,6 @@ gtk_popover_init (GtkPopover *popover)
   popover->priv->tick_id = 0;
   popover->priv->state = STATE_HIDDEN;
   popover->priv->visible = FALSE;
-  popover->priv->transitions_enabled = TRUE;
   popover->priv->preferred_position = GTK_POS_TOP;
   popover->priv->constraint = GTK_POPOVER_CONSTRAINT_WINDOW;
 
@@ -246,12 +243,6 @@ gtk_popover_set_property (GObject      *object,
       gtk_popover_set_modal (GTK_POPOVER (object),
                              g_value_get_boolean (value));
       break;
-    case PROP_TRANSITIONS_ENABLED:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      gtk_popover_set_transitions_enabled (GTK_POPOVER (object),
-                                           g_value_get_boolean (value));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
     case PROP_CONSTRAIN_TO:
       gtk_popover_set_constrain_to (GTK_POPOVER (object),
                                     g_value_get_enum (value));
@@ -283,9 +274,6 @@ gtk_popover_get_property (GObject    *object,
     case PROP_MODAL:
       g_value_set_boolean (value, priv->modal);
       break;
-    case PROP_TRANSITIONS_ENABLED:
-      g_value_set_boolean (value, priv->transitions_enabled);
-      break;
     case PROP_CONSTRAIN_TO:
       g_value_set_enum (value, priv->constraint);
       break;
@@ -297,10 +285,7 @@ gtk_popover_get_property (GObject    *object,
 static gboolean
 transitions_enabled (GtkPopover *popover)
 {
-  GtkPopoverPrivate *priv = popover->priv;
-
-  return gtk_settings_get_enable_animations (gtk_widget_get_settings (GTK_WIDGET (popover))) &&
-         priv->transitions_enabled;
+  return gtk_settings_get_enable_animations (gtk_widget_get_settings (GTK_WIDGET (popover)));
 }
 
 static void
@@ -1721,20 +1706,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
                             TRUE,
                             GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  /**
-   * GtkPopover:transitions-enabled
-   *
-   * Whether show/hide transitions are enabled for this popover.
-   *
-   * Since: 3.16
-   */
-  properties[PROP_TRANSITIONS_ENABLED] =
-      g_param_spec_boolean ("transitions-enabled",
-                            P_("Transitions enabled"),
-                            P_("Whether show/hide transitions are enabled or not"),
-                            TRUE,
-                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
-
   /**
    * GtkPopover:constrain-to:
    *
@@ -2340,60 +2311,6 @@ gtk_popover_get_modal (GtkPopover *popover)
   return popover->priv->modal;
 }
 
-/**
- * gtk_popover_set_transitions_enabled:
- * @popover: a #GtkPopover
- * @transitions_enabled: Whether transitions are enabled
- *
- * Sets whether show/hide transitions are enabled on this popover
- *
- * Since: 3.16
- *
- * Deprecated: 3.22: You can show or hide the popover without transitions
- *   using gtk_widget_show() and gtk_widget_hide() while gtk_popover_popup()
- *   and gtk_popover_popdown() will use transitions.
- */
-void
-gtk_popover_set_transitions_enabled (GtkPopover *popover,
-                                     gboolean    transitions_enabled)
-{
-  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
-
-  g_return_if_fail (GTK_IS_POPOVER (popover));
-
-  transitions_enabled = !!transitions_enabled;
-
-  if (priv->transitions_enabled == transitions_enabled)
-    return;
-
-  priv->transitions_enabled = transitions_enabled;
-  g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_TRANSITIONS_ENABLED]);
-}
-
-/**
- * gtk_popover_get_transitions_enabled:
- * @popover: a #GtkPopover
- *
- * Returns whether show/hide transitions are enabled on this popover.
- *
- * Returns: #TRUE if the show and hide transitions of the given
- *          popover are enabled, #FALSE otherwise.
- *
- * Since: 3.16
- *
- * Deprecated: 3.22: You can show or hide the popover without transitions
- *   using gtk_widget_show() and gtk_widget_hide() while gtk_popover_popup()
- *   and gtk_popover_popdown() will use transitions.
- */
-gboolean
-gtk_popover_get_transitions_enabled (GtkPopover *popover)
-{
-  g_return_val_if_fail (GTK_IS_POPOVER (popover), FALSE);
-
-  return popover->priv->transitions_enabled;
-}
-
-
 static void
 back_to_main (GtkWidget *popover)
 {
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index becdfb202b..ded43519f9 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -97,12 +97,6 @@ void            gtk_popover_bind_model      (GtkPopover            *popover,
                                              GMenuModel            *model,
                                              const gchar           *action_namespace);
 
-GDK_DEPRECATED_IN_3_22
-void            gtk_popover_set_transitions_enabled (GtkPopover *popover,
-                                                     gboolean    transitions_enabled);
-GDK_DEPRECATED_IN_3_22
-gboolean        gtk_popover_get_transitions_enabled (GtkPopover *popover);
-
 GDK_AVAILABLE_IN_3_18
 void            gtk_popover_set_default_widget (GtkPopover *popover,
                                                 GtkWidget  *widget);
-- 
2.30.2